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

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



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