Merge Android 12

Bug: 202323961
Merged-In: Ib5136d6b1d938fdfdd7789ee8c45834b44ed33d3
Change-Id: If0bf21490878eea261edd5f9b9593fa3c4fd8e8f