Merge "[Partial Screensharing] Option text is cropped with max font size" into...

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

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



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