Merge "Add @Nullable to Object#equals()" am: 577fd4a912 am: 83fc6687df

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d13a249fabc93baaa0d01de3f9c6cec7ddd11e4