Merge "Add android.settings.ACTION_APP_BATTERY_SETTINGS to public API" into qt-dev am: a0d852907d
am: 4e56a0e44a

Change-Id: Ib62bcd24790943ad0724106a4dcea5afbc837fdd