Merge "Partial Screen Sharing: Fix truncated "Show touches" text" into...

Merge "Partial Screen Sharing: Fix truncated "Show touches" text" into udc-qpr-dev am: c4c9b9b1 am: 7ac03256

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



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