Merge "DO NOT MERGE: Remove test that depends on tz data" into stage-aosp-oc-mr1-cts-dev