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

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

Change-Id: Ie27690a1aefb9739d186aa3ddc8368053320623a