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

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

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

Change-Id: Id9661ed0f33b44bb821174e79df20f217c616bd1