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

Change-Id: I1b200c40de397bc246b8534033a6bc632e5bfc7f