Merge "Prevent displays that are disabled from receiving input" into...

Merge "Prevent displays that are disabled from receiving input" into tm-qpr-dev am: 3ca7a5ab am: 970f2df3

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



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