Merge "Fix flaky ItemsProviderTest" into sc-mainline-prod am: eb30dc00a6 am: 61e0a57cb0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/17659184

Change-Id: I3f426e5dee46df60aa18e2899a34f6804293d1d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>