Merge "Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev am: a031b0d6a1 am: 1f368850d8  -s ours" into oc-mr1-dev-plus-aosp