[automerger skipped] Fixed equals and hashCode am: 9edb93ce am: 004ad82f...

[automerger skipped] Fixed equals and hashCode am: 9edb93ce am: 004ad82f am: 675d97e6 -s ours am: 01000e7e -s ours am: 523e954f -s ours

am skip reason: Merged-In Ibc80d41f3019a4ebb012358f3369d69222925214 with SHA-1 59ca6fcb is already in history

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



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