Merge "Don't store invalid pkgs when migrating filters" into udc-dev am: e80c807b am: 44a67ff5

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



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