Merge "[DO NOT MERGE] Workaround to avoid deadlock in MediaProvider" into nyc-dev am: 546f7005c4
am: ce8af0a31c

Change-Id: Id84d2cdc929664faf2a54e9a4504f4d8258a327a