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

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

Change-Id: Iab8475912ecf95b90d24eb5b2dc9165e4442a347