Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Iec8b23ed5f6a3ca57e37c65b557405073ba95696
Change-Id: If3f22f118083f4e4605cd04e54f901d9a766b186