Revert "[TEST] Disable the mergeCdbFileUpdates step for testing"

Test succeeded.
This reverts commit 172c827de65973c98490f35d4da9aaf7df461408.

Change-Id: I55eaea82a16e548a42796dfcd64c9998808ffc36
Merge "Revert "[TEST] Disable the mergeCdbFileUpdates step for testing"" into production