[automerger skipped] Merge "Removed IWLAN legacy mode support" am: 878985b2...

[automerger skipped] Merge "Removed IWLAN legacy mode support" am: 878985b2 am: 0963c64d am: 86ae78a7 -s ours

am skip reason: Merged-In I8b5d53dc913a46a18093b865bd4fc12eed20d711 with SHA-1 d8d3ed41 is already in history

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



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