Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-mainline-prod am: ec4cfd92aa

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

Change-Id: I72a0a9804f2f65aa309a00447ae1f7cc55f7cfeb