Merge "Persist pending notification history on shutdown" into rvc-dev am: f460a9cd am: b5fe464e am: 4b654347 Change-Id: Ib15c3e41a4c54360b1835fc2b03415a825462ed8