Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" into...

Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" into sc-dev-plus-aosp am: 6b6e3e88 am: aeb3f24e

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

Change-Id: I8c09f6f8a1cc535e49fdabbeb843e6483517c8b7