Merge "contexthub: Handle service death" into oc-dev
am: bbcf199e93

Change-Id: Icdb7d82550743333a373bdc08b061751999dc54b