Merge "Fork AbstractResolverComparatorTest" into tm-qpr-dev am: 60bc4b08fa

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/20257738

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