aml_tz4_332714070 (11568890,com.google.android.go.tzdata4,com.google.android.tzdata4)
Revert incorrect TM Branching Stage 4 merges am: cb3f6044c1

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/x86-64/+/17919929

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