Android platform 11.0.0 release 13
Merge cherrypicks of [15900324, 15907740] into rvc-platform-release.

Change-Id: I7975675d2d3e23e1a9b8996cf58a1ec550af21bc