Merge "fix "Comparison method violates its general contract!"...

Merge "fix "Comparison method violates its general contract!" IllegalArgumentException      When the difference between the elapsedRealtime() values of two Entries exceeds the maximum size of an integer, casting the long result to an integer will cause an overflow." into main am: 4175c64b am: eb7e53ba

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



Change-Id: I27ecce741fd19ba5bd9021d97e274807315caff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>