Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE

Merged-In: I77e4f30cdea1d0e938a0693d70b27796294a75be
Change-Id: I45d2d1b2b51d7714187d23adc9a77ea70fe8581a