Merge "Merge "Remove clock mode time picker when only testing spinner mode" into oreo-mr1-cts-dev am: 446733be03"
am: 13fc122f50

Change-Id: I4f8f90beb9b0206180ab14d3b04bd7a7a977b76a