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

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



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