Merge "Remove clock mode time picker when only testing spinner mode" into oreo-mr1-cts-dev