Android 12.1.0 release 12
Merge cherrypicks of [17615051] into sc-d2-release.

Change-Id: I96c125cc8f9a0e4cf49adda3915c39b853b729c8