Merge "Merge Android 12" am: 86b156e8a8

Original change: undetermined

Change-Id: If84f5ea3d92b0fc88d9046c7a045862faabafdcf