Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90
am: 935706425d
am: 3a21d96f32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304 Change-Id: I1ffbe2b734e365ffb4197f9485c36f233f3df708 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: