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

Change-Id: Ia43b3dfae65bc30fce526f5b529d0f27b5f8fbea