Merge "Clear calling identity before calling into UserManagerService" into qt-dev