Merge Android 12 QPR 3

Bug: 236045730
Merged-In: Ib180dd17c60190d33e006c84dfe32cdd4b53ce10
Change-Id: I47f8f0cdb30f2bc200d6691e1add8161f16e70b1