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

Change-Id: I5a84a804529eedbc673199107084d63fbdedb1c5