Android Platform 11.0.0 Release 18 (8331765)
Merge cherrypicks of [16194632] into rvc-platform-release.

Change-Id: I69e9e0f874e25df4d7c5dac63262a7014b0ee62a