Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into...

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

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

Change-Id: Iaeeca8bdcdc10efda537090243f34dc7caa670bf