Merge "Update time format" into sc-dev am: 20da155d am: 9792f7ae am: 8400f486

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14847409

Change-Id: Ie940a8c15aa496a3ede9d27237246628e4ac4d49