Merge "Clear caller identity before calling dpm#getAccountTypesWithManagementDisabled" into udc-dev