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

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

Change-Id: I3175b04e7b6c59b7a675512be558b4870d32ab68