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

Bug: 330383433
Change-Id: I1186b292b51764b6706e7c9c27a13c8b9ba36850