Merge Android 12

Bug: 202323961
Merged-In: Ibd657c8fc8a3169a4e83e192a157f2e9e5e1240a
Change-Id: I261359334b74ed35eed116716a33ea55d5083fa3