Merge "Revert "Deflake NotificationEntryManagerInflationTest"" into rvc-dev