Merge "Merge Android 12" am: 86b156e8a8 am: 58a869c924

Original change: undetermined

Change-Id: I9241f39db83f9ac88ee38041de8298aa07401197