[automerger skipped] Merge "Update BatteryStatsImpl to handle multidisplay"...

[automerger skipped] Merge "Update BatteryStatsImpl to handle multidisplay" into sc-v2-dev am: 684c0b4a am: 05c4ff8a -s ours

am skip reason: Merged-In I4ad4f54b6897f406e4ec0f59834dd4762083e0d8 with SHA-1 5f05b4ff is already in history

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

Change-Id: Ibbef8f05361a4ef0384a0c99229591591c0eff96