Merge Android 12

Bug: 202323961
Merged-In: I5fcea49e0ecab3433a0e369a44d42569ac5d40ae
Change-Id: I451034eb6d46650a38451fad9542ee1141cd24e5