Merge Android 12L

Bug: 222710654
Merged-In: I474c54f4117a6100b2c735f46a7a02b0b9c27e07
Change-Id: Ia6363d99538295b797a15b676f980f2d10854db7