[automerger skipped] Merge "Clean up ResolverListAdapter::rebuildList()." into tm-dev am: 6876316d am: 5a1124f9 -s ours

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

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



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