[automerger skipped] Merge "Make Cover Art storage more robust to filesystem...
[automerger skipped] Merge "Make Cover Art storage more robust to filesystem issues" into rvc-dev am: 4d76cdc5 -s ours
am skip reason: Change-Id Iae0f29ef4b75d2c001642685c4a4b76da43bb7ed with SHA-1 63989c98 is in history
Change-Id: I037740c02e27d1f5a720d7005610e214449efa50