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

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

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