[automerger skipped] Stabilise test by removing complicated checks am: 486e6b4a3c am: 66c5b99717 -s ours am: e2e4aa5d33 -s ours

am skip reason: Merged-In Ifef6323f8f6abe7c9375ebe843ce91ec9e2afb15 with SHA-1 486e6b4a3c is already in history

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

Change-Id: I1a7f225fa0db5a98d3e0e1037809d981ca928120