Merge "Copy verified_boot.xml unconditionally." am: 6194be0ff3 am: 67e78c0131
am: f0bb226ee2

Change-Id: Ice03d1f0869151dba4ab2c3817a812054b0ec939