Merge Android 12

Bug: 202323961
Merged-In: I9bb827bc5cf4f2bb5dc7cbb81d26aa44b074d366
Change-Id: Id92058a96422f8e59b3f5d2c2d645d83912fb6cd