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

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



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