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

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

Change-Id: I734505734f87141ef08fbcfe8383d2e9ef0abcef