Merge changes from topic "presubmit-am-7e0f8decf1534e95a25450c07aba46b6" into...

Merge changes from topic "presubmit-am-7e0f8decf1534e95a25450c07aba46b6" into tm-mainline-prod am: bb4a1919

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



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