Merge cherrypicks of ['partner-android-review.googlesource.com/2755567', 'partner-android-review.googlesource.com/2755569'] into android13-msm-pixelwatch-5.15-24Q1-release. Change-Id: I4ff7aa83b6d58ccb9834b109e071e3c9ad2d62f2 Signed-off-by: Coastguard Worker <[email protected]>