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