Merge "Fix issue #10971287: Make ACCESS_BATTERY_STATS permission system or signature." into klp-dev