Android 12.1.0 release 21
Merge cherrypicks of [18356443] into sc-qpr3-release.

Change-Id: I034663b637e6c37521b93c5f8633e4a9ae4f7f67