aml_cfg_341510000 (11285611,com.google.android.configinfrastructure)
Revert incorrect TM Branching Stage 4 merges am: 98a74d03cf am: 78a2d13c0c am: e8ad5a9f08 am: 5602c086c8

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/17920446

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