[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on tz data" into nougat-cts-dev am: 23ddc89da3  -s ours skipped: f5387f6317 skipped: 3ca349cb4b skipped: 8d0a135253 skipped: efd79b5c6c skipped: ff04e09381
am: f7fac4de6d

Change-Id: I05633351113990f8d2b13223af9a5f6d8b1bdae1