Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Icc1c437bcb529defe59ce82df732e596ea14118e
Change-Id: Ice3ea2716fe6e3cb3eb739f06b2a0c13393d17f9