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