Merge "Merge "Adjust wifi idle times to fit in system time period" into...
Merge "Merge "Adjust wifi idle times to fit in system time period" into nyc-dev am: e1f6975e am: 73be9053" into nyc-mr1-dev-plus-aosp
am: f3d09db6
* commit 'f3d09db6':
Change-Id: I611459253a374194826576083e369a3d661e32c3