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

Change-Id: Ibdf452819ba5c7f5b65aab17dc7e93874aa33d74