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

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

Change-Id: I303c38550dced6867c96e6ec68d2347084231ee7