am 7ac190d6: Merge "default wifi sleep policy change" into honeycomb

* commit '7ac190d60d794b5f75b094a0b9a3f666742d42fb':
  default wifi sleep policy change