Merge "Avoid test flaky" into main am: ec571901be

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

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