Merge "Update notif ranking on consolidated policy change" into rvc-qpr-dev am: dfd1bdbc

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

Change-Id: I781e01d5b866d2c58fd1b021b8b0a4aad1096a35