[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 10b32ad8 -s...

[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 10b32ad8 -s ours am: 57673ed0 -s ours

am skip reason: Change-Id I9fa27f3fe37a1739598044d29b48c3f39ebe1c98 with SHA-1 ca24924f is in history

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/1520156

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1305b6c3450f1fbb4decad92d057c7601a541955