[automerger skipped] Merge "Fix up discrepancies between v1 and v2 package...

[automerger skipped] Merge "Fix up discrepancies between v1 and v2 package parsing" into rvc-dev am: 9f15ba2e -s ours am: 885e3ce8 -s ours

am skip reason: Change-Id I1301e28540314d0e643b73af7146c1a366eca6b5 with SHA-1 45482569 is in history

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

Change-Id: Ia273fa412a61a0f446bac04493ef35cf3d94f597