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

Merged-In: I75ac09abf1fad467cddb8aaed7632d34c69bb9f8
Merged-In: I0a7a6f22c7368b3a852da9523c53dc50789919bc
Change-Id: I4c8b126ed263d9a57254d5f3fac5682c5d2430d7