Merge "Consider "similar" change modes the same for promotion purposes" into...

Merge "Consider "similar" change modes the same for promotion purposes" into tm-qpr-dev am: 559b8310

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



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