Merge "Pass correct user id to PackageInstaller for uninstall" into udc-dev am: d15246003b

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

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