[automerger skipped] Merge "Clean up ResolverListAdapter::rebuildList()." into...

[automerger skipped] Merge "Clean up ResolverListAdapter::rebuildList()." into tm-dev am: 6876316d am: c55f2b59 am: 62427e66 am: ff8670b4 -s ours

am skip reason: Merged-In I2e74d68579be8b34716ba2202ac2a08361008400 with SHA-1 dc029cbb is already in history

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



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