Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-dev-plus-aosp am: 3d46803aee am: b8dff25882

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

Change-Id: I599d306dae2bcfe7491d6eebea1fcc549c27f4b2