Merge "Expose the following ServiceState API as system APIs"
am: f19833ca7b

Change-Id: Icd39f4d6a517d5adf654c50f9fd4fd2f631b3876