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

Change-Id: Ie354f06495f0c3fb73aa053956ecc371716bab3f