Merge "Allow charger to read ro.charger.*"