[automerger skipped] Merge "Don't store invalid pkgs when migrating filters"...

[automerger skipped] Merge "Don't store invalid pkgs when migrating filters" into sc-dev am: e25f86aa -s ours am: eb709f44 -s ours am: 99398cb3 -s ours am: d8552707 -s ours am: d5019fb5 -s ours

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

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



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