[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: d0186a2d -s ours

am skip reason: Merged-In Ic9866962330f0b51727e5202560d97ffac0b8980 with SHA-1 4e17d257 is already in history

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

Change-Id: Iee6cdf9c14d16da0df81a1548185833b8bfb8927