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

Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-dev-plus-aosp am: 2c7cd22d am: e6c645a4 am: 71a71624

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

Change-Id: I5dff000dacb84182ca8304742a021398fefb11f0