Merge "Camera: Adjust VTS tests for zoom override latency" into udc-dev

TEST_P(CameraAidlTest, processZoomSettingsOverrideRequests) {

    const int32_t kFrameCount = 5;

    const int32_t kTestCases = 2;

    const bool kOverrideSequence[kTestCases][kFrameCount] = {

        // ZOOM, ZOOM, ZOOM, ZOOM, ZOOM;

    const bool kOverrideSequence[kTestCases][kFrameCount] = {// ZOOM, ZOOM, ZOOM, ZOOM, ZOOM;

                                                             {true, true, true, true, true},

        // OFF, OFF, ZOOM, ZOOM, OFF;

        { false, false, true, true, false } };

                                                             // OFF, ZOOM, ZOOM, ZOOM, OFF;

                                                             {false, true, true, true, false}};

    const bool kExpectedOverrideResults[kTestCases][kFrameCount] = {

            // All resuls should be overridden except the last one. The last result's

            // zoom doesn't have speed-up.

            {true, true, true, true, false},

        // Because we require at least 2 frames speed-up, request #1, #2 and #3

            // Because we require at least 1 frame speed-up, request #1, #2 and #3

            // will be overridden.

            {true, true, true, false, false}};