Android 12.1.0 release 24
Merge cherrypicks of [17008939] into sc-d2-release.

Change-Id: I4f7c68313f16099fad4d62c0a87f0c4f2c2b98a6