Merge Android 12

Bug: 202323961
Merged-In: I269ea522ba7356dca0bfa43e8a8ee8acdba7b7a2
Change-Id: Id163159e965a5325ff9f2f51d43ab3214fb55779