Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Ibbeb1c1e066ac2b41a370539c7f85ac7937f1d4c
Change-Id: I4fa3ddb539071fe1dc8bf5887c04caf586f91e35