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

[automerger skipped] Merge "Don't store invalid pkgs when migrating filters" into sc-qpr1-dev am: c5a0685a -s ours am: e25eb978 -s ours am: b008032e -s ours am: 83239708 -s ours am: 6b120a92 -s ours am: 787cae86 -s ours

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

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



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