Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-qpr1-dev am: 6553465417
am: b1c97edfbf
am: 72fdb0b8aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516 Change-Id: I687280e0948868ee22628ac9e915f38653233c2a
This commit is contained in: