Merge "Fix up discrepancies between v1 and v2 package parsing" into rvc-dev am: 9f15ba2e

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

Change-Id: I16d7715f9392649329a90ec2e04f5b9a44978938