Merge "Move blockingTasks to run outside transaction" am: b3ba76e986

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

Change-Id: Ib5fbe05d2ae12dab70200d363d54797883e99859