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

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

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