Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I3db77416153723e0482ca7d31f9b76e3d552f637
Change-Id: Iaa1dd9b6f574deb5dd4766f5490293a893a45ab8