Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev am: 5416ffde

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: I6ee98b123204aa1c83b18409bdb12e1e46f568f4