Merge "Pass correct argument to handleIncomingUser." into tm-dev am: fd5b2cea am: 81d71f2c am: 549ef021

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



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