tree aeb52f536849648d20038cba3b487e9b17da10f2
parent f95fdb894af2a848fb37415c88eed35c39552749
parent b604c7b9751a9e900613f710bbb15feb17ac1023
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1689283977 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1689283977 +0000

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

Change-Id: Ifcedeefbe24af5eb0eb837b0f6467b080285bd05