[automerger skipped] Merge "Don't store invalid pkgs when migrating filters" into sc-qpr1-dev am: c5a0685aa9 -s ours am: e25eb978f8 -s ours am: b008032e70 -s ours am: 639da6cf48 -s ours

am skip reason: Merged-In Ib7fcb733edd2cf2cbac0a7699763a5fe993b467e with SHA-1 f867b29763 is already in history

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

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