Merge cherrypicks of ['partner-android-review.googlesource.com/2718470'] into android13-msm-pixelwatch-5.15-p11-release. Change-Id: I11bbbd4ff6b15e579421364a728ddc3736936c26