[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: d497f69015 -s ours am: 43bb1561c7 -s ours

am skip reason: Change-Id If519752201f61bb36d8a96620d07327b3f6f8f02 with SHA-1 bbf8425a8c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99607033e6760d5bf560712824ad405f6799b985