Merge "Update PowerManager to make ambient display suppression apply to...

Merge "Update PowerManager to make ambient display suppression apply to dreams." into tm-qpr-dev am: 63402cf7 am: 8ec6437d

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



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