Merge "Sort after all notifications are filtered" into sc-v2-dev am: 267391fd26

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15641542

Change-Id: I699bf877482abd11e6b16a802ea0bb33d98ed669