Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev am: a458f9cdea
am: d0ac40c376
am: db8d2773f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064551 Change-Id: Ifa68eaa23bfeab7d755c65e2658f208c50b13fc1
This commit is contained in: