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

Change-Id: I1a1a6468921ca5e23cc250aacb713153433917a3