Merge "Merge "Persist pending notification history on shutdown" into rvc-dev am: f460a9cd am: b5fe464e am: e6759f8e am: 092cb4f4" into rvc-qpr-dev-plus-aosp