Android 12.1.0 release 14
Merge cherrypicks of [16848665] into sc-d2-release.

Change-Id: I1dbdc68200c75955375d14dbedb602966d2a2e63