Merge "On notification update, take the newest value of shouldHeadsUp" into tm-qpr-dev am: 7b4b07cc6d am: 6296706051

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

Change-Id: I2a411d377fb0f1ca8287a71636d71ed7303276e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>