Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev am: a458f9cdea

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

Change-Id: I7e17d32624aab42fa101f03c2848c88d2aa01d3d