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