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

Change-Id: I8cee159484faf9f30205dcde0f0b527d3bf620e6