Merge changes from topic 'disabled-reason'

* changes:
  Fix failing WifiConfigManagerTest test.
  Add a disabled reason for recommendation providers