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

Change-Id: Iba79bb053dea965e94b722731bc766bb98363f12