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

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