Merge Android 12

Bug: 202323961
Merged-In: If9b84f4bd56e7bd5d92a2b9e1ecf6c04650a0bd4
Change-Id: I9461ffe4fe4e182cf6067b64c6855afcd733d587