Respect restoreAnyVersion=true in full-data restore path
am: d990e4d3df

Change-Id: Icf3e6bbfd0fa42707c317d114048d7fe66bf0844