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

Change-Id: Ie423b63a584f58053e219aee7915a1b1871a2d77
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>