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

Change-Id: I96b0fb1d453ce299e1d7669211002a0b997fe333