Merge changes from topic "cherrypicker-L23200030000689269:N91700030011100373" into main am: d2720aa47f

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2863349

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