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

Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-dev-plus-aosp am: 3d46803a am: b8dff258 am: 2ae1d2c2

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

Change-Id: If11fb20eda2714ad8b58fb7833edffb9f48d11f4