Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32

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

Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792