Android platform 11.0.0 release 24
Merge cherrypicks of [16422896] into rvc-platform-release.

Change-Id: I33ed0ee155e83ed599da09e21e85bc6a229ac751