Merge Android 12

Bug: 202323961
Merged-In: I6ee17a46a996524dae41452ca769c88fdea78e3e
Change-Id: I39890d04b9a27a2120c8ad451d16ef9524589502