Merge "Remove the duplicated constant declaration in DateUtilsBridge" am: 3db0441e5c am: c52a84acf3 am: 70862e266e am: ba3ebf0844

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

Change-Id: Ib42950c40ec43b639846407b5c768aba379aebca