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

Change-Id: I217a2b9a1b05a4b2cff206d48f17ce8e5ba62eaa