Merge "Camera: Handle duplicate camera Id due to openLegacy support" into stage-aosp-master

    mUniqueCameraIds.insert(id);

    if (isAPI1Compatible) {

        // addDevice can be called more than once for the same camera id if HAL

        // supports openLegacy.

        if (std::find(mUniqueAPI1CompatibleCameraIds.begin(), mUniqueAPI1CompatibleCameraIds.end(),

                id) == mUniqueAPI1CompatibleCameraIds.end()) {

            mUniqueAPI1CompatibleCameraIds.push_back(id);

        }

    }

    if (parsedId != nullptr) {

        *parsedId = id;