Merge "Make ACTION_SETTING_RESTORED SystemApi"