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

[automerger skipped] Merge "Don't store invalid pkgs when migrating filters" into tm-qpr-dev am: a66ffda2 -s ours

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

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



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