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

[automerger skipped] Merge "Don't store invalid pkgs when migrating filters" into tm-dev am: 004cce1b am: 95c732f0 -s ours am: 5dca9f2b -s ours am: 677f4474 -s ours

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

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



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