Merge "Fix CameraHidlTest"

        const sp<ICameraProviderCallback>& callback) {

    Mutex::Autolock _l(mCbLock);

    mCallbacks = callback;

    if (mCallbacks == nullptr) {

        return Status::OK;

    }

    // Add and report all presenting external cameras.

    for (auto const& statusPair : mCameraStatusMap) {

        int id = std::stoi(statusPair.first);