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

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

Change-Id: I4644c471b72af621f83a1f07a46bdda877821041