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

Change-Id: I0fd2116606658280f645ed39995fd9adea51db97