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

Change-Id: Ic943b53c54020b73c572bf3c9d8dfaca5528793f