Merge Android 12

Bug: 202323961
Merged-In: Ie89126842fae34a8788cad7b4569f2b793e1c176
Change-Id: I773dc4d5c5dcfadec348d4e4aab38fd5461af84d