Android 8.0.0 release 21
Merge cherrypicks of [2782411, 2782222, 2782918, 2782412] into oc-dr1-release

Change-Id: I00c4e2e93490ccb577a2857519d9125c306d6ea4