Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" into sc-mainline-prod am: ac8b1cd444
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587 Change-Id: I745d393c7226a633ab494c5b59d27b81d9b60dad
This commit is contained in: