[ Merge of http://go/wvgerrit/95365 ] The changes made to how DeleteEntry (now InvalidateEntry) works introduced a few additional edge cases which were not covered from the previous set of unit tests. Bug: 150887808 Bug: 149100568 Test: Linux unit tests and Android unit tests Change-Id: I263b72fb708c6546294af23ae5ddbd2e82da34df