Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: If2d442a524f007c46e864ae5256993ca7d39d905
Change-Id: Id6f94752d3b4c25c1cdf0e86d75482c3d7b0caac