Merge "Improve MediaProvider WW atoms" into rvc-dev am: 89d5f51c7e

Change-Id: I6aeddd6efd3f1725da5f14d01a3dd94cead18090