Merge "Fix TextClockTest to work when time starts as 12-hour mode." into pie-cts-dev am: c0df988be2 am: 5394169adb am: be11c4433e
am: 12715c9e12

Change-Id: Ifa5c2629b058e942f1f9b327e39eae15cada4f85