Merge "Add ADB shell command to set dim amount using an arbitrary UID"