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

Change-Id: I4ccb28478827dd1fd90f032f47112ac750f96dad