Merge "Fix fetching incorrect items after filtering" into tm-dev am: 9b4b25e3

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



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