[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-plus-aosp am: 5b66a3d0 am: 68b57b03 am: 6f9d980c -s ours

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

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

Change-Id: I2299cb195df54a2e8890cfca76ce87ecd97004f1