Merge Android 12

Bug: 202323961
Merged-In: Ib7b0d096d3f47ca7b9522b7da75373420edd02d9
Change-Id: I3331ab8f496deb8dc499de093a2089602e30dd5b
tree: 984752b3ef2ab3ca0cd36d524fab8336b6b84afe
  1. android/