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

Change-Id: I37fa5929aab6a4cb7534e1f1f3bf79c045cda9ac