Merge "Update verifications depending on a missing #equals()" into tm-dev am: da09f196

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



Change-Id: I49152361c9033c771352817d1a12b60446ef3002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>