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

Change-Id: I5cdd383803f43b71d2a27f1e9cdac70b6b512f60