[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: e35c7922a1 -s ours am: eafc233abc -s ours am: 2121f72641 -s ours am: 123c714da6 -s ours am: b4d0dd5598 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2130156

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