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: bffba354 am: 3fea045e

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



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