Merge "Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: KeyChainTest for device that don't have Secure Lock Screen" into nougat-cts-dev am: 453f138f95 -s ours am: 6acd335de5 -s ours am: 0dd8c457a6 -s ours am: e4063a61fe -s ours am: be56906a9e -s ours am skip reason: subject contains skip directive"