Merge "Revert "change DragDropTest's screen orientation to "portrait""" into pie-cts-dev
am: 356a4c4b49

Change-Id: I39475b0336c8e6514ae9ca51a32fe76328fbfdc1