Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b

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

Change-Id: Ie9fb258fd1c063363b545a0bb5db659f3f207bb4