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

Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-mainline-prod am: 590c5033

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

Change-Id: I3e5022dfb1d52a4fd27c48b2c33990d7a6c750f5