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

Change-Id: I2c279d366b68cad9f049b271913acfcfc4ce3913