[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on tz data" into oreo-mr1-cts-dev am: f110df675a  -s ours
am: af51cff70a  -s ours

Change-Id: I4cfb44a4a444e595d074f80fd6879b7c2bfb6615