Merge "Merge "Add a config for "wake screen on notifications"." into...

Merge "Merge "Add a config for "wake screen on notifications"." into tm-qpr-dev am: 19e7b945" into tm-qpr-dev-plus-aosp am: dfc06deb

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



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