Merge "Clear binder identity for UserManager calls"