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

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

Change-Id: I8bbd4c6301858afdcd95fa5c3ce979d8277eaf47