am e8b92b6b: am 6c906dc5: Merge "Fix SystemUI crash on devices with WiFi only" into klp-dev

* commit 'e8b92b6bc32bbb0bcd34ffe2979771b4104bed67':
  Fix SystemUI crash on devices with WiFi only