[automerger skipped] Merge "DO NOT MERGE Unregister notification listener before creating a new one to avoid duplicate Heads Up notifications." into qt-qpr1-dev am: a8422821ac am: 084b7afe4e -s ours
am skip reason: subject contains skip directive

Change-Id: If87de4c2391b5b97155cb3a4449b95871b7da0d3