Android platform 11.0.0 release 13
Merge cherrypicks of [15948718, 15919336] into rvc-platform-release.

Change-Id: I7de90843f85b9fac90413414c0377598f5f94cf4