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

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



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