Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev am: 47bb70329b
am: 7fc6f84bb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238 Change-Id: I256857ab6c0c4454218bab44b152d0f39a18a07a
This commit is contained in: