Merge Android 12 QPR 3

Bug: 236045730
Merged-In: I8d79f3a4c2de564e193d41aae1ff72ba9b12114d
Change-Id: I7122697d9104670e42db4ec4d53bd3f5356b3142