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

Change-Id: I40071bfd87247e7310664110472ff55332e92231