Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Id546c541980bcb3fc14e3847f7dcc684687af7e1
Change-Id: Id0dbc41b16621067ee9dec32c310b408e2f39445