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

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



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