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

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

Change-Id: I523e47fac345e6acda05d4cf13b97b39bf4c0a91