Merge "Expose the following ServiceState API as system APIs" am: f19833ca7b am: 3b1241b603
am: 8a0d0dffb9

Change-Id: I12ca8f02bc36aec2a946615187ea7b7ff4dbc5af