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

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