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

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

Change-Id: I82fb0b3aba48edec57a03a5d5ad26f4ed4d95dcd