[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on tz data" into lollipop-mr1-cts-dev
am: 862510826b -s ours
am skip reason: subject contains skip directive

Change-Id: I56813beabe7ecb5bb5f853b9e21cac354f5460e7