Merge "[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on tz data" into marshmallow-cts-dev am: b918a5b479  -s ours" into nougat-cts-dev
am: 1ff89cae94  -s ours

Change-Id: I5ae2644c0527ca755e81a376d23b4b794f39ad2f