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

Change-Id: Ic947629dc5b10aa968dec3bd270a84ead7b36b5b