[automerger skipped] Merge "Create ResolverComparatorModel interface." into...

[automerger skipped] Merge "Create ResolverComparatorModel interface." into tm-dev am: ca46e52c am: 5e6edca7 am: 492fcdd0 am: 1afe4020 -s ours

am skip reason: Merged-In If88bf7a5a6394d81c021782d5d9bce7955f1c0e6 with SHA-1 6cdd926f is already in history

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



Change-Id: I310a28f03abe44195f99d3b30e13d491251f92f5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>