[automerger skipped] Merge "DO NOT MERGE Hold onto NotificationListener when...

[automerger skipped] Merge "DO NOT MERGE Hold onto NotificationListener when reconnecting notifications UI." into qt-qpr1-dev am: b8960726 -s ours am: c644bff0 am: 63d81614 am: f2db14e2 am: 3f125e62 -s ours
am skip reason: subject contains skip directive

Change-Id: Id8f44e30900efb1844ee15db3cd407bb33ac386a