Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into...

Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into sc-dev-plus-aosp am: 3f600594 am: a7559753 am: 4559f1ee

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

Change-Id: I22e51d2ea712e52c80cf53f94a023025d23ba234