[automerger skipped] Merge "Check DPC package validity during package updates"...

[automerger skipped] Merge "Check DPC package validity during package updates" into tm-dev am: 4f6c3f6d am: 83744dfd am: 497ff781 -s ours am: 2421206b -s ours am: b2275053 -s ours am: c9ed1344 -s ours

am skip reason: Merged-In I1743c111f8e8b5f4c1f878a61b88b8f1ed6b86a1 with SHA-1 2b60a030 is already in history

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



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