Merge "Fix adb command for multiple users" into sc-dev am: 38dfae8c am: 735a35d7 am: 69e20143

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

Change-Id: I0e3b43ba3b5dac62a5e27114f6c79a25ac7bb571