[automerger skipped] Merge "Migrate remaining parsePackage V1 to V2" into...

[automerger skipped] Merge "Migrate remaining parsePackage V1 to V2" into rvc-dev am: a83fad74 am: 85ac670d -s ours

am skip reason: Change-Id Ib21dbbdc556502144df8e3d7a26b7a9d33885cd9 with SHA-1 3cb5610a is in history

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

Change-Id: I24351271ce685f69e2503e30f1ff5fe11a81c702