Merge "Fix adb shell cmd config remove command when no (uid, id) pair is specified."