Fixed equals and hashCode am: 9edb93ce73 am: 004ad82fce

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

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