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

Change-Id: I6ff19cc9220deee8a506e9ed4e64e1e644244537