Merge "shell: allow reading battery info dirs in /sys" am: 71955fc7ad
am: cf013954d4

Change-Id: I60d92a6709153567e29f9448a1cd4d2b54de4eb2