Merge "Better support test for DirectBootHostTest" am: 51bad2de0c am: 5025a429ae am: eed9c21c7e
am: 3171e9d539

Change-Id: I0aade9aa76417b1a80bb9dacbae122a04273158a