Android 8.0.0 release 21
Merge cherrypicks of [2793689, 2793690, 2790745, 2793230, 2792812, 2793231, 2790746, 2790747, 2793232] into oc-dr1-release

Change-Id: I90f37c9338179e50d67c9c5a63b335c99ac30f7d