Merge "Fix LingerMonitor notification rate limiting"
am: 822d2b5991

Change-Id: I68800c06e8d4413b2e46176a12dc60b436277653