Merge "Add @Nullable to Object#equals()" am: 009f021811 am: 2a61f079a8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d13a249fabc93baaa0d01de3f9c6cec7ddd11e4
tree: 8da0df251b9d454a7f578792f505b4818215cda0
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS