Merge changes from topic "presubmit-am-86b67679f79a443d894e334b04855145" into...

Merge changes from topic "presubmit-am-86b67679f79a443d894e334b04855145" into tm-mainline-prod am: 69c324e0

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



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