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