Merge Android 12 QPR 3

Bug: 236045730
Merged-In: I830930d1df2956d19fbc86e19fa7cf1392623d49
Change-Id: I0c94d0947561458ea5298ad0a49b6851623c5397