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 am: ae86d7b9

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

Change-Id: I513bf394514407c1c4852c6bc99a799f2a7311a1