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

Change-Id: I7ce59ff2f41fdce367819dfe4bae625fff60b17c