am 15e099cc: am 0e0942c7: Merge "Default WiFi sleep policy setting"

* commit '15e099cc09589f963933f046d7267552ba3ffad8':
  Default WiFi sleep policy setting