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

Change-Id: I7b605d87408184102919c082823ff1045ea4351a