Merge android13-msm-pixelwatch-5.15 into android14-msm-pixelwatch-5.15

Bug: 330383433
Change-Id: I2057087404c7c9ad3af371287258de0cd0be09b0