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

[automerger skipped] Merge "Don't store invalid pkgs when migrating filters" into sc-v2-dev am: 8ff72497 -s ours am: 1ea1d030 -s ours am: 4feab144 -s ours am: d5c41390 -s ours am: 87ec5c96 -s ours am: 09473c50 -s ours

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

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



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