[automerger skipped] Merge RQ2A.210305.007 am: 36a18716db -s ours

am skip reason: Change-Id Ie5b6e5a83380a10bcd98812d232d378593f8b458 with SHA-1 dfbae81268 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I424fb35f545b18b53621196c5ac4b6d60c375b5e