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

Change-Id: I84f68dbe3055c365ab95fd17872ceba3a227d7a4