Merge "Revert^2 "Re-land test tzdata apex with bazel builds."" am: aea34a38

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



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