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

[automerger skipped] Merge "Create ResolverComparatorModel interface." into tm-dev am: ca46e52c am: f87143c0 -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: I462fb4303f7fe389074be71da5288f3d2c758488
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>