Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into...

Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp am: 9b874759 am: 65bd2f41 am: ec0f4865

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

Change-Id: I6e120cd56ad2c42ecc0e7ef9cf7b2dd46e5c3149