Merge "Merge "Dramatically simplify NotificationRankingUpdate." into qt-dev am: d4d9b233b2 am: 1421c7395c" into qt-r1-dev-plus-aosp