Merge Android 12

Bug: 202323961
Merged-In: I854661d3c39b306d304c2b74724d802312555bf5
Change-Id: I2c5b93b1b3f2b3d8fa9c516a96c167855add90d8