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

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

Change-Id: If89ea1b23a0e34f2f5e556b79f73c44dd257f0bc