[automerger skipped] Add BatteryUsageStats.add(BatteryUsageStats) am: 36e0ae27a9 am: 7cd1108de1 -s ours
am skip reason: Merged-In I1e5060d726fd0f4634fd658483e80a9ab02e24fb with SHA-1 36e0ae27a9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14433337
Change-Id: I88993833cc27fc586a6d6febf2fbb42f4ba46066
This commit is contained in: