Merge "Use permission com.android.settings.BATTERY_DATA" into main