[automerger skipped] Merge "Avoid test flaky" into main am: ec571901 am: 60d85b93 -s ours

am skip reason: Merged-In Id1290e6979fdafa93ded6f50e49d6b3464a80b50 with SHA-1 1955144f is already in history

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



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