Merge "Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c0738 am: cf33fd7910" into nyc-mr2-dev-plus-aosp
am: ef5d594abb  -s ours

Change-Id: Ib00d39fe1102bbe95171620420dc1016f02502dc