Merge changes from topic "presubmit-am-ea97047cb12a4d7ba090018d262e4d7e" into sc-mainline-prod am: 68745620

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

Change-Id: I47e3d183bd36426f160c3729b28595ec3bc55872