Merge "Fix the problem that the title of MainsSitchPreference will be truncated." into sc-dev am: d8d35066 am: b5794e0f

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

Change-Id: I74ba97c179cab47aa023e03eb764a117539e2c5b