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

Merge changes from topic "presubmit-am-c49a96c26d054adbb0d2e7c248dd53a1" into tm-mainline-prod am: 67b061ae

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



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