Merge "Revert "Re-land test tzdata apex with bazel builds."" am: ed35066e am: 8c518038

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



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