Android 8.0.0 release 33
Merge cherrypicks of [3131624, 3131640, 3132432, 3132435, 3132438, 3132441, 3132444, 3132447, 3131929, 3131930, 3131931, 3132492, 3132493, 3132033] into oc-dr1-release

Change-Id: Id794b1d2e4a60a197f611b0ab4ee13282b13666b