Merge changes from topic "presubmit-am-675c16673be14f3c9c962115ad9638ec" into sc-mainline-prod am: 97224a4a9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16156271 Change-Id: I1e8122f6787aa5d408959fce18a5479c420ad932
This commit is contained in: