Android platform 11.0.0 release 12
Merge cherrypicks of [15677565] into rvc-platform-release.

Change-Id: Ice0dd74d0fedbabb45854c991c25d09c71675af3