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

Change-Id: I7e2cb7db0a1ac084ed9d4b399459077099c3169a