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

Change-Id: I9616339992b4ea6de71422371bdcce641b5e2a65