[automerger skipped] Merge "Limit the number of UidBatteryConsumers included...

[automerger skipped] Merge "Limit the number of UidBatteryConsumers included in the BatteryUsageStats atom" into sc-dev am: ab31594c am: 78ba53c3 -s ours

am skip reason: Merged-In Ic9866962330f0b51727e5202560d97ffac0b8980 with SHA-1 969e4064 is already in history

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

Change-Id: I412ca4d03f25b43019d05466c9fe76a6634c3cd4