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

Change-Id: I4b130625dcc4f01c414633fe34c7bc31dceeabb5