Merge "Revert "Add android.settings.ACTION_APP_BATTERY_SETTINGS to public API"" into qt-dev
am: 5ed91dd1cd

Change-Id: I0fb2af0231f06b879bc4a1c08cd803460b7181f9