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

Change-Id: I2d3766df9d4d6d87434f8ecf98eb42a468c1e20e