Merge Android 12 QPR3 ab/8391262 Bug: 226662282 Merged-In: I82840ca0ac39ac303f58845738d9ec99cd589404 Change-Id: I511b60170ebbc3b595a40d0f0c65e031ccec6e43