Merge "Add service-state content provider"
am: c1d3c501c1

Change-Id: I4f878abc7c36cd617aee63ca326b7d366143df38