Merge Android 12

Bug: 202323961
Merged-In: I08def438da6bb24c22ebf876645771eb308ca73e
Change-Id: Ia7b60371934af26b405c72438a28aef76d6d58c2