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

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

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