[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: e515da46e7 -s ours

am skip reason: Merged-In Ib7377ae7b86f2efc80bf3dabcbef8f67dca27691 with SHA-1 a7f3fe2b1c is already in history

Original change: https://android-review.googlesource.com/c/device/google/barbet/+/2130155

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