Android platform 12.0.0 release 23
Merge cherrypicks of [19980643, 20100213] into sc-platform-release.

Change-Id: If2d0a7ce6d3d86b0912860d0b88257024c5f313e