Merge "Rename 'wifi_legacy_hal' to 'android.hardware.wifi@1.0-service'" am: 4376d21e7f
am: c8356e5ca7

Change-Id: I99a6c03a4b6562c2447453c15d05d1096806dbe6