Merge "Update shell command line to take optional user id." into sc-dev am: c030fb12 am: 59365a8a

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

Change-Id: I0bf10476a086c859c29daffc87b32c23293ed290