Merge "contexthub: redefine hub_app_name" into nyc-dev
am: ca2a3df

* commit 'ca2a3dffb359d8735904fecc2fa759ad7bf0f616':
  contexthub: redefine hub_app_name

Change-Id: I7533f1966203e7ca6a74a9c886c7e09845403683