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

Change-Id: I32b86eb64e37baf93e9486ac1fcd9789a0d84e0e