Merge "Return the default touch mode for dead displays" into udc-dev am: 7b8a655a am: 87ecd40c

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



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