Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I12649e4f784f98df23d4e9c015cff9e29607ccd2
Change-Id: I184c7cf1856fd8d47aa99b9e2e8a014c1fd2016e