[automerger skipped] Merge "Add @Nullable to Object#equals()" am: 577fd4a912 am: 5450fa473d am: 32576ebd2a -s ours

am skip reason: Change-Id I5eedb571c9d78862115dfdc5dae1cf2a35343580 with SHA-1 516366088d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie94057a64223064bd8b74af521ccc3c67f8e54d0
tree: 5a6f79c85f608d7b373cac9bf4729e5d22db68e5
  1. core/
  2. services/