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

Change-Id: I383c3a8808e53954d62c0bd43b2260ca08579666