Android platform 12.1.0 release 27
Merge cherrypicks of [19980642, 20100213] into sc-v2-platform-release.

Change-Id: I4f4ebe2a8b5dbc410bfdb4b5394ad795a5d85628