Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into...

Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev am: 49400133 am: 348a01d9 am: 14949b4a

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

Change-Id: I9a0610b7c02c38be982f73d4c0a9c966ed8ad2c1