Android 8.0.0 release 30
Merge cherrypicks of [2489285, 2489286, 2489323, 2489399, 2489257, 2489326] into oc-release

Change-Id: Ie5ff5184b49e46a20cc74570095e1a5363c1c9ae