Merge "Fix recomputeMediaTypeValues to accumulate all updates and update later" am: 21f4c7b545

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

Change-Id: I7dbd26fffb3d1319c6dc23d222f7adca5bc2c83c