Merge tag 'android-8.1.0_r40' of https://android.googlesource.com/platform/system/extras into a8.1.0

Android 8.1.0 Release 40 (OPM4.171019.021.R1)