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

Change-Id: I4dcd26b7fff376862b951a2006d4f248d04f1bbd