Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: DirectBootHostTest on the device that doesn't support secure lock screen" into nougat-cts-dev am: 27764a59cb -s ours am: 079ebb8c7e -s ours am: 84a1c051aa -s ours am: 70c8804f62 -s ours am skip reason: subject contains skip directive" into pie-cts-dev