[automerger skipped] Merge "Removed IWLAN legacy mode support" am: 71e4fc7a...

[automerger skipped] Merge "Removed IWLAN legacy mode support" am: 71e4fc7a am: ad92e547 am: b6e488af -s ours am: 401ce825 -s ours

am skip reason: Merged-In Ie3a5bbd57da3b80956d2178c0cedebf33502a8b1 with SHA-1 2832dee6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2370228



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