Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 169e4b7848

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d8285b33cc90cce2b73d9d1b564756addbbc8d2