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

Change-Id: I299abbaf1fa953745edca2655b9e8ffad55cd719