Merge SQ3A.220605.009 am: d8b5b31f8f

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

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