Merge "Check custom component names before aggregating BatteryUsageStats snapshots" into sc-qpr1-dev am: 0ef5152b am: a401999f am: 2a4043a6

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

Change-Id: I9c2c12c54c6ff07bdcf15833146a5ad8e58c4234