Merge "Zero out WiFi duration and power if ControllerActivityCounter is null" into sc-qpr1-dev am: c410f29893 am: bfe149f2ed

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934611

Change-Id: I19fdba5bffb025cb61f4de03fe8cf78c3b7c479b