Merge changes from topic "DateUtilsBridge" am: 59d12aa8bd

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

Change-Id: I1252a566bb306075cdfeff09415b85cf5557c792