Merge "Update fingerprint AIDL with additional display id field."