Merge "Fix extraction of package dir from package ID" into main am: fbb70489fd

Original change: https://android-review.googlesource.com/c/platform/development/+/3042075

Change-Id: Ic3523d83fda417ff99e254fffc8a0b43ccf7569a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>