Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on tz data" into marshmallow-cts-dev am: b918a5b479  -s ours" into nougat-cts-dev am: 1ff89cae94  -s ours" into nougat-mr1-cts-dev am: f04d3eefb0  -s ours" into oreo-cts-dev