Merge "ContextHubService: Keep handles across hub reboot" into nyc-mr1-dev
am: 8e91087c3a

Change-Id: I19a98795ccfbf09e464f4332844189ded0982090