Merge "Add support for "input" service running as user AID_INPUT"