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

Change-Id: I4de5ec7ce9735c2bd588c6660b182fd29ef5e1ac