Android platform 11.0.0 release 26
Merge cherrypicks of [16566268, 19085842] into rvc-platform-release.

Change-Id: I1980a91bd7be6ee345b715937d2937ddeede02cf