Android platform 12.1.0 release 16
Merge cherrypicks of ['ag/20612022'] into sc-v2-platform-release.

Change-Id: Ic802a92448f126b9370e7f22d0fd16b66a9f4723