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

Change-Id: I546949f24346816e4b2021111e12484a625e7d2f