Merge "Deflake NotificationEntryManagerInflationTest" into rvc-dev am: 027d35a0 am: 3fb1dba1 am: 03b52ae9 Change-Id: I9e1791d4eb1bdafb8d44adbd69912ab0475b766f