Merge "In onDragEvent(), don't assume text is Spannable" into oc-dev
am: 99e620ef32

Change-Id: I5431864f75241c9f8b33064981ea332e7bef823b