Merge "PM: Use installed userId while moving apps" into main am: d03e417b7b am: e24844ce43

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

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