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

Change-Id: I45d10cb78a32e891fc3fcd05b6b5232ba7762457