Merge Android 12

Bug: 202323961
Merged-In: Ic4e8108ccb5816e3616b446fba3d140a86c73a59
Change-Id: I6d38ca342ae60d7c4d47b0c54e7cd1c553a4ea1d