Merge "ContextHubService: Don't change app handle on load" into nyc-mr1-dev

    app_instance_info_s entry;

    assert(appInfo);

    const char *action = "Updated";

    if (db.appInstances.count(appInstanceHandle) == 0) {

        action = "Added";

        appInstanceHandle = generate_id();

        if (appInstanceHandle < 0) {

            ALOGE("Cannot find resources to add app instance %" PRId32,

                  appInstanceHandle);

            return -1;

        }

    }

    const char *action =

        (db.appInstances.count(appInstanceHandle) == 0) ? "Added" : "Updated";

    entry.appInfo = *appInfo;