Merge "Fix up discrepancies between v1 and v2 package parsing" into rvc-dev-plus-aosp am: 5b66a3d0eb am: 68b57b03d4

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

Change-Id: I6f71cfe71f430b6514f85d2dabc64667cca03c43