Merge "Revert "Remove capability setting for legacy_wifi_hal"" into oc-dev am: df54d0efc3
am: f7e92a235f

Change-Id: Ie5c31fdc751d59b7261e7667167a43076d486ff4