Merge Android 12

Bug: 202323961
Merged-In: I118a1dfd5c52cfe1dbc3b1099f29b4146aff1803
Change-Id: I8786bb7570eb69fb5c17ff240f95b9d22fe1c675