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

Change-Id: I8d14c887adfccb48ef2bbd55d2dffe38dc686425