[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: I468f7b0ec71699e61343f6f71afcf14fa98cad9e