Merge Android 12

Bug: 202323961
Merged-In: I719bf2855573d90163919bfab7c33c7a9161d8ad
Change-Id: Ic1622182a27c6de73f61adcd775220b86972dd86