[automerger skipped] Merge "Fix up discrepancies between v1 and v2 package parsing" into rvc-dev am: 9f15ba2e1a -s ours am: 885e3ce868 -s ours am: a7a31d1889 -s ours
am skip reason: Change-Id I1301e28540314d0e643b73af7146c1a366eca6b5 with SHA-1 4548256900 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11688819
Change-Id: I49b8628d66696155c13c9f033b0283c0a53448ee
This commit is contained in: