Merge "[automerger skipped] Merge "Fixes switch-user -w command." into rvc-dev am: a0eed34e am: 31f2268b -s ours am: 2f699321 -s ours am skip reason: Change-Id Ib3d70d21cc379f136983f9ddcda31f5bab3f045e with SHA-1 fd7c398e is in history" into rvc-qpr-dev-plus-aosp am: 6995421f -s ours
am skip reason: Change-Id Ib3d70d21cc379f136983f9ddcda31f5bab3f045e with SHA-1 fd7c398e is in history

Change-Id: I7f3d940ef9f18f5ffe81f9a9315a474b5a633cb6