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

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



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