Merge "Revert "Add android.settings.ACTION_APP_BATTERY_SETTINGS to public API"" into qt-dev