Merge tag 'android-8.1.0_r26' of https://android.googlesource.com/platform//system/hwservicemanager into HEAD

Android 8.1.0 Release 26 (OPM2.171019.029.B1)