Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into...

Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-dev-plus-aosp am: 93e7956a am: 798e2adb am: 07ae1a8b

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

Change-Id: I6496cdd7ae77ea9b43c7798e2fa365040a5e60d9