[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: 729b6773 -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: I876a9ac3a1b9b351edc6d2403fcb6182255bfb87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>