Android platform 11.0.0 release 20
Merge cherrypicks of [17730676] into rvc-platform-release.

Change-Id: I069c1305498ef7b73bb8831cf0705a64b4e991f8