[automerger skipped] Merge "Fix PerformanceTest#testBulk to accumulate batch notifyChange" into rvc-qpr-dev am: 378b44b3ee am: 76d87e60a6 -s ours

am skip reason: Change-Id Ib3ed1560d15b57ec6b82e2f98e2faa25a20e1350 with SHA-1 f890b37e23 is in history

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

Change-Id: I096750930ad5ac2f2a0491f85879739d3aa935a0