Merge "Fixed (again :-( `am start-user` for profiles." into udc-dev am: f9d3cbde am: 10142ed0

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



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