Merge "Only honor passed-in userid value if work profile flag enabled" into...

Merge "Only honor passed-in userid value if work profile flag enabled" into tm-qpr-dev am: 6af3a824 am: 3b0103fa

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



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