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

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

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



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