Merge "move ACTION_SERVICE_STATE to system api" into oc-dev
am: 5effb5f645

Change-Id: I5b61b20b646a9bfae4e0f89c70f7af71f626c740