Merge "Update fingerprint AIDL for Android U" into udc-dev