Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev