Android platform 12.0.0 release 23
Merge cherrypicks of [17034413] into sc-platform-release.

Change-Id: I13aaa44b311dba3327ff37052cb261d544851773