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

Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-dev-plus-aosp am: 46a1f587 am: f897c417 am: 1b80b5ad

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

Change-Id: Idd9f43952260ee02146706f134170413e583b2aa