Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev am: 49400133f1 am: 348a01d9fe

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

Change-Id: Id8807d589752d09a0dc1d81ac95b233136f0e898