Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Ie1b27d286785c75292449886030bd6420b5a2c6d
Change-Id: I93f2de585186b20ca8d2e7b5d5bbe95f80931df1