Merge Android 12

Bug: 202323961
Merged-In: I22d294c2396f98749438111ee03fcae2987f8aba
Change-Id: I800180169c87baa184600aece343e326a5a6e580