Merge "install-multi-package fix" am: cf5dedd1d5 am: 5f3ced82f4

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1362351

Change-Id: I8eaef439a60e323c94ce5797ab93970d4f48937a