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

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

Change-Id: I6ff83f882fac3cf045defe4aa297495d3b011ddc