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
am: fc5eb77754

Change-Id: I34bfc9f468c9253d787ca629f26e4d70a7271541