Merge changes from topic "am-0ae48a37c3b346e898e031e9c7937468" into sc-v2-dev-plus-aosp am: e75bf7fe3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002 Change-Id: I37b888b6f2d383ddb1a06361cec6410dd49f8703
This commit is contained in: