tree ce9a4855fd31a2dc8ea29c6abad79ea8a310795b
parent 747fb65088dc3cd9e0f878ce1013e157eafb1159
parent b5592bee47fa31aea75aedaeb4826f55dbbc6403
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1701911324 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1701911324 +0000

Merge cherrypicks of ['partner-android-review.googlesource.com/2640861'] into android13-msm-pixelwatch-5.15-24Q1-release.

Change-Id: Idd4a423b2ba404dbf384bcdb1d0f5024dd7681e3