Merge changes from topic "cherrypicker-L23200030000689269:N91700030011100373" into main am: 9e58dbf4b2 am: 077e772133

Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2864191

Change-Id: I92231683fc6a954a552e3b8a8e5c8ae3fd9aa95d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>