Merge changes from topic "presubmit-am-69008cfea6c94780a0c9a9e956ead727" into...

Merge changes from topic "presubmit-am-69008cfea6c94780a0c9a9e956ead727" into tm-mainline-prod am: 485bfa10

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



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