[automerger skipped] Merge "Add @Nullable to Object#equals()" am: 577fd4a912 am: 83fc6687df am: f549173d9c -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie94057a64223064bd8b74af521ccc3c67f8e54d0