Merge "Persist pending notification history on shutdown" into rvc-dev am: f460a9cd am: b5fe464e am: e6759f8e Change-Id: I4d21c0b325fe7923d22b3747230473572ee10fcb