Merge "Ignore the flaky test in the ConvertUtils first to investigate" into sc-dev am: 394211dd75

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

Change-Id: I22b5e6c7e2a0eaaa31fdda2adf60a2aa1ad60dbf