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

Change-Id: I830906c6b6056597d15db8f43a116452713a09d8