Merge SQ3A.220605.009 am: de7209e8a0

Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2130132

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