Merge "Add composite string for battery summary in settings" into pi-dev am: a6b7a6fb33
am: 4e6ef66fc1

Change-Id: I9ec56fc3221ae14f311587e405b56031686f8eed