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

Merged-In: I343b7074cc80f932103447d930ccdcdc8f0a1919
Merged-In: I8cded70542e54edc32282b8263b32678766097e3
Change-Id: I833610122255da3f2f760a1b6dbcf16d51884546