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

am skip reason: Change-Id I7e33c7496821677a3534898e772e57d050953f67 with SHA-1 5f88083d31 is in history

Original change: https://android-review.googlesource.com/c/device/google/trout/+/1521219

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib166691f832e6d0793f87125fe010241ce291252