Merge "Use permanent cache for EventMatcherWizard" am: d3f31a9fa3 am: 2ab3cb8027

Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/2070727

Change-Id: Ia38b3b1250e44ecf5a6d4c609d042fde1786a8f3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>