Merge Android 12

Bug: 202323961
Merged-In: Ie8202a904494f570f2d894947337f05066d35992
Change-Id: Ia2153c6a36d0b4f2f5aff09a1bc0450fa63fa91b