Android O MR1 IOT Release 1.0.2 (4862549)
resolve merge conflicts of 3dd3a1ed to oc-dev-plus-aosp
am: 88bb68148b  -s ours

Change-Id: Ia01e3a737ad6af93a3549b9db4703b629cde34e2