Merge "Re-land test tzdata apex with bazel builds." am: 10004938 am: 55d7bc77

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516675



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