Merge Android 12 QPR 3

Bug: 236045730
Merged-In: I36e233dc5b59feec9354f9aef6f231babbbcec6f
Change-Id: Ie3de5c4a7566ae5ed6bc2e3549029d7d42cfc27c