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

Change-Id: Ifcedeefbe24af5eb0eb837b0f6467b080285bd05