Merge "Allow ItemDragListener to have a custom timeout." into arc-apps
am: 1980cbc4a6

Change-Id: I54993710062cdb9b3be229f98b696ed1a6bedec0