Merge "framework-wifi: remove duplicate classes" into rvc-dev am: 87ce901869

Change-Id: I29a472aa2d48f7bf1151487c2fa089bb9a2102db