Merge "Get shell UID per-user in AppOpEventCollectionTest" into sc-dev