[automerger skipped] Merge "Add the battery information into device details header" am: 907b3fc4 am: 8ca446a1 am: 100d741c -s ours am: 7c69e295 -s ours

am skip reason: Merged-In Ib9f4c388c369dc374c43dd399111e02b5555159b with SHA-1 57dd3bc4 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085

Change-Id: I2631b7d9f52de0555d415b3d7b561cacefb401e4