Merge "Fix Filter callback race condition" into tm-dev am: e8d0d4fd

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



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