Merge "Merge "Fix wrong Notification refactor" into qt-qpr1-dev am: 9c743a22" into qt-qpr1-dev-plus-aosp am: 33094b44 Change-Id: I808e7fb137d8a7e3e7d67235db4adecdb0fc23dc