Merge "Don't store invalid pkgs when migrating filters" into udc-qpr-dev am: 1fbb60da0a

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

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