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

Merged-In: Ief87507ad7d5a0572d37aec3779465df3ab5b7f8
Merged-In: I4e3d819c9e1cc38f9a738baf1c87c9361295fe51
Change-Id: I46223ddd97b164618b5a1694e811ff4e06938ebe