Merge "Check custom component names before aggregating BatteryUsageStats snapshots" into sc-qpr1-dev am: 0ef5152b am: 4ff921f5 am: d50fbe56

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

Change-Id: I2cb4a0d31aecc225aeae0af291e4497bd5867921