Merge "dumpsys: fix problems with -a option in battery and batteryinfo services"