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

Merge "Merge "[AppsFilter] fix cache lock and rebuild cache if needed" into tm-dev am: cd1a10a2 am: 20d964f2 am: 2fed2ab6" into tm-qpr-dev-plus-aosp am: 13aaeb95

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



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