[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on tz data" into marshmallow-cts-dev am: b918a5b479  -s ours skipped: ab3c2a1d5f skipped: ac1a4c6e25 skipped: 87dfb4403d skipped: 038d2a4658 skipped: 8b12f2eedc skipped: d96a361351 skipped: 792fed6853

Change-Id: Iee216f5a3dbb99c6d7f41d9a57c1ca54ceb84816