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

Change-Id: I49d82a26cd75931b6e81e844a043def05ae17872