am cb5fa5a4: Merge "Remove wifidirect UI listing" into ics-mr0

* commit 'cb5fa5a44779f790fae87102a573816ecc15dd3d':
  Remove wifidirect UI listing