[automerger skipped] Merge "framework-wifi: remove duplicate classes" am:...

[automerger skipped] Merge "framework-wifi: remove duplicate classes" am: 51090a3f am: aadef559 -s ours am: 10d8cb01 -s ours am: 5e8c9e17 -s ours am: c80025be -s ours

am skip reason: Change-Id Ie78e5cf0f6ff7bc8a2fa8d7264b742f912601143 with SHA-1 57bca318 is in history

Change-Id: I0516d87ec2e399025455deb79ac6af70a71fca15