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

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

Change-Id: I3e2fdd4b6e542d3efa8ae85384a9ecadec7d9465