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

Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev am: 7b45d4a7 am: 034ff149 am: 888fb7ca

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

Change-Id: Iab924b36e324163e486da4e56447d0dab7592c67