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

Change-Id: Idf17f87d95556227fdf726c0c0b6c7a6ed21cfba