Merge Android 12

Bug: 202323961
Merged-In: I0630a35da632fc31b294afd916dd9dbea5f982fa
Change-Id: Ied87695717aed6defcf188340aad57db79040ad4