Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp am: 9b874759 am: 65bd2f41

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

Change-Id: Ib7af429a05de931bd79cf8c66b702db4c4e19947