Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-dev-plus-aosp am: 2c7cd22dee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729 Change-Id: Ia0d5acb5f9b1b1fc91ac927e1a33152d48b6cd48
This commit is contained in: