Merge "Deflake NotificationEntryManagerInflationTest" into rvc-dev am: 027d35a0 am: 2d369b56 am: 3f67e617 am: bf7008ef Change-Id: Ib4dee5352ca4c69075834666253802f0a4861d3b