Merge changes from topic "presubmit-am-febb5148f3864699b2afc6cf79966010" into sc-dev-plus-aosp am: 4d1a339b98
am: 1abe5e1740
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583 Change-Id: Idb9a9e8e2aa5bd76c221a8dff9b7eb029e642a2d
This commit is contained in: