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

Change-Id: I340fbfaf5d3b25557978bdc74b054ef0fb301dd8
Signed-off-by: Coastguard Worker <[email protected]>