Merge "Fix ItemTouchHelper log messages when dragging or swiping is disabled"
am: 721de09a57

Change-Id: I2007bb3ba607c3d7af101ad215a059e4507e30fd