Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" into sc-dev-plus-aosp am: 255f3182 am: 37596603

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

Change-Id: I6f73c158b57e6fdd8be98444b10d42c5200dbea4