Merge "Setting the display state to off when the default display is being...

Merge "Setting the display state to off when the default display is being changed" into tm-qpr-dev am: 3284b2ae

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



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