Merge "Add scoped storage tests to mainline presubmit" into sc-mainline-prod