Merge "Add sepolicy for Battery Service client role sysprop"