Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c
am: f1772f686b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623 Change-Id: Iba1b42b2e38903fcff5be73b894d047a94d9bdf2
This commit is contained in: