Android 8.1.0 release 22
Merge cherrypicks of [3416661, 3417182, 3417738, 3417739, 3417758, 3417360, 3417361, 3417362, 3417363, 3416401, 3416402, 3416403, 3417778, 3417798, 3416662, 3416663, 3417799, 3417800, 3417364] into oc-m5-release

Change-Id: I3cf84100b5ed94f450e490484f46f683fd168cea