[automerger skipped] Merge "DO NOT MERGE Hold onto NotificationListener when reconnecting notifications UI." into qt-qpr1-dev am: b896072638 -s ours am: c644bff0c2

Change-Id: I935111857dd07ae60c29e201e9c15b09eb7799be