Merge "Move CtsScopedStorage* tests to "presubmit" groups"