[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "revert-2370228-legacy_iwlan_removal-UKSFKVXSIS" am: 32f2c07a am: c662abd6 am: 1c9635c9 -s ours am: 832b0580 -s ours am: 4cd9abe0 -s ours

am skip reason: Merged-In I8b5d53dc913a46a18093b865bd4fc12eed20d711 with SHA-1 d8d3ed41 is already in history. Merged-In was found from reverted change.

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



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