Merge "Update shell command line to take optional user id." into sc-dev am: c030fb12 am: 75c3e42f am: 396de754

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

Change-Id: I0093f7dbea2bc11099a818309bbab40fc019919a