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

Change-Id: I435ba712020a4733a0a2c1e59a1793b3a50ee299