Merge "[AppsFilter] fix cache lock and rebuild cache if needed" into tm-dev...

Merge "[AppsFilter] fix cache lock and rebuild cache if needed" into tm-dev am: cd1a10a2 am: 20d964f2

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



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