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

Merge "[automerger skipped] Merge "Fix up discrepancies between v1 and v2 package parsing" into rvc-dev am: 9f15ba2e am: eaf090e6 -s ours" into rvc-d1-dev-plus-aosp am: 57200546 -s ours am: 8e3bf54e -s ours

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

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

Change-Id: Ie0d64b3072daf215bac0365ffa46214526100fd0