Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev am: 7b45d4a7ac

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

Change-Id: Ia522af0c4e271be71c76a52b4b8497311950fcc7