Merge "Durable metadata for pending and trashed files." into rvc-dev am: b1232ffe2f am: 03a827a977 am: ecab6c6c54 am: 05bf5f00fb am: 95503b84d9

Change-Id: I13ef24cc826d3e58c82d5ac0f23dc77e5e5fd80f