Merge "Fix equals and hash code methods for the Property class" into main am: 8ce40991

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



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