Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I56e2296651999e37048f8be4c53d7c5b9281666f
Change-Id: I53581f8c0cd4d3e220faf53468f4d571cb823f4c