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

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