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: 0b6c6a09 am: 34edb312

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

Change-Id: I01d51440a737d9f5f51e4e412270e5888f86cf37