Merge "[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: 6d4c677e" into rvc-qpr-dev-plus-aosp am: 3263ab80 -s ours
am skip reason: subject contains skip directive

Change-Id: I95eb870fbaf0cbe387c112100ff2c2abf1a128b2