Merge "Durable metadata for pending and trashed files." into rvc-dev am: b1232ffe2f am: 95d76295a8 am: 4e46ae64e8

Change-Id: If201ff1db13388e2f843bb201d17bb99bae59dec