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

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



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