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