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

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

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



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