[automerger skipped] Merge "Pass correct user id to PackageInstaller for uninstall" into udc-dev am: d15246003b am: f88f97535e -s ours

am skip reason: Merged-In I7781a05b66fe8d6d717081b126484a7581fad965 with SHA-1 0826a2b219 is already in history

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

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