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

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

Change-Id: I4d6fbc2713b8b1d8a1a9d8706dfcf11ce69abbed