Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into...

Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev am: bdbca48e am: 579e3fec am: 6199884a

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

Change-Id: I898667810fa6384eceb8de450c8bc0fe041b3eac