Android 8.0.0 Release 36 (OPR5.170623.014)
Merge cherrypicks of [3084013, 3084014, 3084015, 3084016, 3084017, 3084018, 3084019, 3084020] into oc-r5-release

Change-Id: I96970941251778705b8447ed35094944266fcafd