Merge "Merge "Added TaskSnapshotCacheTest back to presubmit" into oc-dev am: 2ecf42f96c" into oc-dev-plus-aosp