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

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

Change-Id: I83a8ba2d920fd56b5c43500d6c6c56b822682439