Merge "Remove HardwareAuthToken parameters from binder interface"