Merge Android 12 QPR1

Bug: 210511427
Merged-In: I09d5e0ae043b421216856e23644beca76ce54d44
Change-Id: I9ed009c36ef4c9fa50d2284e903fa365fc758ac6