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

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



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