Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: I11cfdae56524722afd33ee3c01fdb3c1559d8c85
Change-Id: I517f7a7454372f79f959df33c13b26202080e33c