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

Change-Id: I457af23944146bf1aec02fe28c192bf56d1a6a12