am b7e393bf: Merge "Bring back Wi-Fi sleep policy setting for wifi-only devices." into honeycomb

* commit 'b7e393bf9b0327833098d2181b0e7125af2181dc':
  Bring back Wi-Fi sleep policy setting for wifi-only devices.