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

Change-Id: I8e30841279f21542ebe9b297271842d1a408050b