Merge "Deflake NotificationEntryManagerInflationTest" into rvc-dev am: 027d35a002

Change-Id: I7c764368a055705b99ce90d95834218428e090e4