Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE

Merged-In: I6f767d411592ac45bd3845ccf43172ffdf9de695
Merged-In: Ib96e7f90dc889723330a2d5e1e69ac2a126b0b0e
Change-Id: Ic8a4704abc785115421f447ae015c7b4653c5334