Merge "Merge "Fix adb command for multiple users" into sc-dev am: 38dfae8c...

Merge "Merge "Fix adb command for multiple users" into sc-dev am: 38dfae8c am: 485dac7c" into sc-v2-dev-plus-aosp am: 7ee4a2a0

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

Change-Id: I43b7a54c60785f990864e2254c89a1a848af2777