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: 4d686ad6

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

Change-Id: I4bdc0aebff3d8048b48d53b03344e72e893cd81b