Merge Android 12

Bug: 202323961
Merged-In: Icf7492e392cf20986990be2752e6357d4cdb352c
Change-Id: I8980bf56fe03eb3dc5306d50d529e6417248934c