[automerger skipped] Merge "Add the battery information into device details header" am: 907b3fc4be am: 8ca446a175 am: 100d741cc8 -s ours am: 7c69e2951d -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: I9aa826724e9117a19717512954b249acc809c637
This commit is contained in: