Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c

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

Change-Id: I31d94c633afda15f05d660e6854c2b6c552a6d7a