Merge changes from topic "DateIntervalFormat" am: 6e706c4cee am: 85c56c1fa4 am: c675c3e826

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

Change-Id: I3634fc38644ec7f48d5ee1e0b016e7411e999d5e