Merge "Add missing log parameters and fix the ordering." into udc-dev

                    // TODO(b/128928355): if this restriction is enforced by multiple DPCs, return

                    // the admin for the calling user.

                    Slogf.w(LOG_TAG, "getEnforcingAdminAndUserDetailsInternal(%d, %s): multiple "

                            + "sources for restriction %s on user %d", restriction, userId);

                            + "sources for restriction %s on user %d",

                            userId, restriction, restriction, userId);

                    result = new Bundle();

                    result.putInt(Intent.EXTRA_USER_ID, userId);

                    return result;