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

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

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



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