Merge "Lock for AppsFilter" into tm-dev am: f5e3cd3e am: 59a98ffb

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



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