Ensuring that we evict ActivityInfos from the cache.

- Once the data that we depend on the ActivityInfos for are evicted, 
  also remove them from the cache so that they are not stale the next
  time we might want to use them.

Bug: 27495264
Change-Id: I615842df4f48deb12a051ef241991a51a10cf383