Android platform 11.0.0 release 22
Merge cherrypicks of [18993507] into rvc-platform-release.

Change-Id: I07b3df26400a23ec2474260a1ac846c192b98f33