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

Change-Id: I8e46bbb8717d0d878d766722bf4279405be2d4d7