Merge "Merge "Return the default touch mode for dead displays" into udc-dev am: 7b8a655a am: c09be4f6" into udc-d1-dev-plus-aosp am: bf1cbcb0 am: e1ddeaef

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



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