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

Change-Id: I404fc988efe0c3a5d40a004f98663d94379ae4d6