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

Change-Id: I140551b74a90386d32bdb076f98447840b00e8e0
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>