Merge "Better support test for DirectBootHostTest" into nougat-mr1-cts-dev