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

Change-Id: Id6f53ec321ce0b987dd77954e95180e22e277d28