Merge changes from topic "revert-2370228-legacy_iwlan_removal-UKSFKVXSIS" am: 32f2c07a

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2510796



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