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: c09be4f6 am: 9a76d796 am: e39d4a15

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



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