Merge Android 12L

Bug: 222710654
Merged-In: Ice502eaba6c5dd8ca1157d3fde1b5b5b223267e4
Change-Id: Ie2b319c7d588f5044c694e85795eef0bc9d14b75