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

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



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