Merge "Make TimestampTest non-dependant on device's time zone." am: 9fc89e05f9

Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2292038

Change-Id: I3be50688d4e7aea1de7bb6989aa6fa8e2b57021c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>