Android platform 11.0.0 release 16
Merge cherrypicks of [15905948] into rvc-platform-release.

Change-Id: I8070f718663bdf16486de3df11b3eb56b8bd458a