Android Platform 11.0.0 Release 19 (RPM1.211109.014)
Merge cherrypicks of [16622627, 16790556] into rvc-platform-release.

Change-Id: Ib8d80ca41d46a9d6285afcf5bdcd434c82bbd02a