Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c0738
am: cf33fd7910

Change-Id: Ic9daa912077d6162092a0adcb5d8debf10be9c55