Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" into sc-dev-plus-aosp am: afa6f208d0
am: bffa291613
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919 Change-Id: Ic8e740912bff55bac6b73d6bfb19d08a2e2cd0e2
This commit is contained in: