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

Change-Id: Ice66e115c8d9307b13182c6f5266ccdc0aa049aa