Android 8.0.0 release 31
Merge cherrypicks of [2780997, 2781272, 2781273, 2780106, 2780107, 2779714, 2779715, 2779716, 2779717, 2779979, 2781313, 2781314, 2781315, 2781316, 2781317, 2781318, 2779718, 2779719, 2781352, 2781353, 2779980, 2781610] into oc-r5-release

Change-Id: I7c94e1288ebc63d51de18c4ed2362e25bd1e0d98