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

Change-Id: I02265e27f7245a13cdfc705dba4cd4de33ed0253