Merge "Clear calling identity before call to UserManagerService" into main