[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: f36e6e82e1 -s ours

am skip reason: Merged-In Ibb1f1cf258ce7af7b3112787b1c6eb7e355df880 with SHA-1 cbdfcfb05c is already in history

Original change: https://android-review.googlesource.com/c/device/google/bramble/+/1741196

Change-Id: Id003645764ec152dbbbe1118915883d63b4edd42