[automerger skipped] Merge "Add @Nullable to Object#equals()" am: 577fd4a9 am: 83fc6687 am: f549173d -s ours am: 622f18ef -s ours

am skip reason: Change-Id I5eedb571c9d78862115dfdc5dae1cf2a35343580 with SHA-1 24403f7e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c6fa6f6ee68e5d016b0b38f602bc4814bca2b03