Merge changes from topic "presubmit-am-50abc0852b4146d4bad97ce28a86b353" into...

Merge changes from topic "presubmit-am-50abc0852b4146d4bad97ce28a86b353" into tm-mainline-prod am: b6523960

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



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