Snap for 5811135 from 2c4a76d9b9fbe55bd1caeca3679e454a2d5b6230 to qt-qpr1-release

Change-Id: I43dba44b5b14b381493ade4eb726561a1d201237
diff --git a/tests/TEST_MAPPING b/tests/TEST_MAPPING
index fb9a374..7e89fcd 100644
--- a/tests/TEST_MAPPING
+++ b/tests/TEST_MAPPING
@@ -3,10 +3,6 @@
     {
       "name": "apex_targetprep_tests"
     },
-// TODO: add timezone_data_e2e_tests back once b/135515636 is fixed.
-//    {
-//      "name": "timezone_data_e2e_tests"
-//    }
     {
       "name": "CtsStagedInstallHostTestCases"
     }