Merge changes from topic "DateUtilsBridge" am: 59d12aa8bd am: f65666d055

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

Change-Id: Idd5d71f2d6b787ddbece60746c97dd2713ecc7cc