tree 712708c6569847733bb45cf310daeb2aca0fe2d0
parent cdf991a7baa495e10ae3ab341ec6772de210bddd
parent 6821b6be32b2a0f93559e9349ef3f71e08de5aa9
author Jason Chiu <chiujason@google.com> 1635820096 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635820096 +0000

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