Merge changes from topic "am-4518399b59a1469084ce724347b5bde1" into...

Merge changes from topic "am-4518399b59a1469084ce724347b5bde1" into sc-v2-dev-plus-aosp am: cf02f672

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

Change-Id: Iefe58b52b3c1b9f1a9046a408d790859960b4b00