Android 8.0.0 release 21
Merge cherrypicks of [2833489] into oc-dr1-release

Change-Id: I995a6a1ab1a4b155b9392873c4865d7e5b0dadf6