Android 12.1.0 release 15
Merge cherrypicks of [16790594] into sc-d2-release.

Change-Id: Id9cf8fce509c50d00b197ccdc43b7c5ed8325d89