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

Change-Id: I2818f4db6080cd863273792475e451e3867a8620