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

Change-Id: If828bfef3cb59bf740b678fb9f088969d322ba5a