Merge Android 12

Bug: 202323961
Merged-In: I5f03abc910e89df453d691cb31fceb3f05b287e6
Change-Id: I8d4eb75b23cbf723e550536e1ba0da55c517758c