Merge "Merge "Revert "Do not send updates for disabled displays."" into tm-dev...

Merge "Merge "Revert "Do not send updates for disabled displays."" into tm-dev am: 54e0824f am: 525a41a6 am: afb3de7b" into tm-qpr-dev-plus-aosp am: 90d0c0d3

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



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