Merge "Fix truncated string in bubbles setting screen" into sc-v2-dev am: 045983a6d2 am: 95405970bb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16338885

Change-Id: I6c98c4f79416aded71898bc61cb45e82c0b8c018