Merge "Fix up discrepancies between v1 and v2 package parsing" into rvc-dev...

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

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

Change-Id: I6c3336097746832c8c318b7dbf0a54c1be448b6c