Merge changes from topic "presubmit-am-e743e17e9016460ba59c5e44ff871904" into...

Merge changes from topic "presubmit-am-e743e17e9016460ba59c5e44ff871904" into tm-mainline-prod am: d79f27a6

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



Change-Id: I347f1ab36d3bf7f2dad08335e05c813c202217e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>