DO NOT MERGE: Reduce re-ranking

A small subset of the improvements in change I2ea746c3.

Bug: 62827235
Test: runtest systemui-notification
Change-Id: I5cd399b5a66e5b849cf88eb2287f7619e1094c0d
1 file changed