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 am: c9aa4e46

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



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