Merge Android 12

Bug: 202323961
Merged-In: Idfae2fb505d1558378eace8b1fe41304aed70ab5
Change-Id: I2cb0f42a0d0bfe0fa4c0be3c123110c27f946134