Merge "[Partial Screensharing] Option text is cropped with max font size" into tm-qpr-dev am: 2a3596b27e am: b6525cff17

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

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