Merge "Persist pending notification history on shutdown" into rvc-dev am: f460a9cd1f

Change-Id: Ie2ffc2bc46511cfc54ec34db4bf655a77249536f