Merge "Revert "Expose ACTION_USER_SWITCHED as system API""