Merge "Use permanent cache for EventMatcherWizard" am: d3f31a9fa3

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

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