Merge "HIDL changes for IWLAN refactoring" am: 4365f2e6bc
am: fd428d8f4d

Change-Id: Id0f6e64d592cd362303cb366823d1c36f4457b76