Merge Android 12L

Bug: 222710654
Merged-In: I0905ed58461fefec1e86b49cd93769c25b65f58e
Change-Id: I0b491353a7443f29124bad5b354cc887d17920a3