Merge "Fix --user parameter when setting app op for shell with shell command."...

Merge "Fix --user parameter when setting app op for shell with shell command." into sc-dev am: 58f468f1 am: 9f950f5c am: 3b0c087b

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

Change-Id: Ie5f092d797fea6103992d84f11577c126d822820