[automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am:...

[automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 169e4b78 am: 7896d739 -s ours

am skip reason: Change-Id I1fd1e50fcf6f79ae904cc7d6576c2f18039cc55c with SHA-1 b917bd0e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b5535a79aa640b3540ca37c2911babcacd29e49