[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: ea3910ce -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a713aa8a5c0ac2839de57d37ebc34e460f6920c