Merge "DO NOT MERGE: Remove test that depends on tz data" into oreo-cts-dev am: 4b2992e9 -s ours am: 92d6d883 am: 10808152 am: 07af9af8 am: 39c5eecb -s ours Change-Id: I9386e9ec9f50736e1ae1ec93c7a0226defeef33b