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