Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f

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



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