[automerger skipped] Merge "Add the battery information into device details header" am: 907b3fc4be
am: 8ca446a175
am: 100d741cc8
-s ours am: 7c69e2951d
-s ours am: 9ed4917433
-s ours
am skip reason: Merged-In Ib9f4c388c369dc374c43dd399111e02b5555159b with SHA-1 57dd3bc444
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085
Change-Id: Iab2fd6630703905f177f9d66fa3581fb6c88c5ee
This commit is contained in: