Merge Android 12

Bug: 202323961
Merged-In: Ia43d5fae534345b6120ae83cf6601240e2983466
Change-Id: I79d9fcebc88e784b7b5efd7915a715487ef612ad