Merge "Revert "Make CHANGE_APP_IDLE_STATE a system API""