Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev
am: a031b0d6a1 -s ours
Change-Id: I3971f4e7d4d21630d7055d74207f08813b26d875
This commit is contained in:
am: a031b0d6a1 -s ours
Change-Id: I3971f4e7d4d21630d7055d74207f08813b26d875