[automerger skipped] Add wait flag to am switch-user command. am: fddf07e8 am: 63db0cc6 -s ours
am skip reason: Change-Id I41bbcff0c79677ba3bf6b58e1fc96cd13a681b33 with SHA-1 e2043617 is in history
Change-Id: I815cdc77eb71a40231d08e5e96dfdd914e053777