Merge "Actually count explicit broadcasts as usage" into sc-dev am: 9e3ce77c...

Merge "Actually count explicit broadcasts as usage" into sc-dev am: 9e3ce77c am: 117e5825 am: 329d1b16

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

Change-Id: I9f0882e0aa5b97d3cf6aa26763d758849228d181