Android 12.1.0 release 23
Merge cherrypicks of [18138589] into sc-d2-release.

Change-Id: I8abd65afbce4493d46ac986b13f57a01dbf94bfa