[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: 88ae9352 am: a8b5c264 am: 3eb111ab -s ours
am skip reason: subject contains skip directive

Change-Id: I39dbceabddbe9e4fdedcf1affe0e0d482ed628f1