[automerger skipped] Merge "WMS retrieves uid for the package based on the...

[automerger skipped] Merge "WMS retrieves uid for the package based on the linux user" into tm-qpr-dev am: 1549391e am: e6c2a39f -s ours

am skip reason: Merged-In Iac9fea3935c3aadf29a21d8af715df845e8ea43c with SHA-1 4e530d3b is already in history

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



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