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

Change-Id: I2f979da0db041c807646e642da626549fb308f11