Merge Android 12L

Bug: 222710654
Merged-In: Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f
Change-Id: If95800025d050393cf92c4f20724c973b154a4ac