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