[automerger skipped] Merge "Add @Nullable to Object#equals()" am: 577fd4a912 am: e20d178f56 am: 8f3e3f4541 -s ours
am skip reason: Change-Id I5eedb571c9d78862115dfdc5dae1cf2a35343580 with SHA-1 76a6131fdb is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574815
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie94057a64223064bd8b74af521ccc3c67f8e54d0
This commit is contained in: