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

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