Merge "Merge "Query DeviceConfig flag for Notification WakeLocks" into udc-dev...

Merge "Merge "Query DeviceConfig flag for Notification WakeLocks" into udc-dev am: a8c33220 am: 3b5de0b1 am: a5246fa0" into udc-qpr-dev-plus-aosp am: bf67ddfa

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



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