Merge "PM: Use installed userId while moving apps" into main am: d03e417b7b am: e24844ce43 am: 623d171dca am: 280b30d1bf

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

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