Merge "Return the default touch mode for dead displays" into udc-dev am:...

Merge "Return the default touch mode for dead displays" into udc-dev am: 7b8a655a am: 71627af3 am: cb9c6e93

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



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