Merge cherrypicks of ['partner-android-review.googlesource.com/2636804'] into android13-msm-pixelwatch-5.15-eos-release. Change-Id: Icabf221fe03b370dc5082dd13b445bbc09db42c1