[automerger skipped] Merge "Fix recomputeMediaTypeValues to accumulate all updates and update later" into mainline-prod am: 35e3446c94 -s ours

am skip reason: Change-Id Id334dd8bee95fd3d841b53be90fb50bb541e7e28 with SHA-1 d28a436c17 is in history

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

Change-Id: I0cc2c93d9cf505158a7a5760cbf50cb19d713e60