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

Change-Id: I314e60256bd7e7c50ebc7f87e6d23b9cecec57a2