Android Platform 11.0.0 Release 21 (RPM1.211109.018)
Merge cherrypicks of [16905018] into rvc-platform-release.

Change-Id: Ie56346bdc5dfa2bfd14d3142c6132c747eaa7498