Merge "Make AppOpsTest use user-specific shell UID" into stage-aosp-sc-ts-dev