Android Platform 11.0.0 Release 18 (8331765)
Merge cherrypicks of [16873353, 17102592, 16371387, 17089346, 17112304] into rvc-platform-release.

Change-Id: I3423212c214520a324aec0bd49d52be1911ac373