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

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



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