Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into...

Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2 am: fd9774a6

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

Change-Id: I91779796d31881527854776514ce87e4e6751365