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 skip reason: subject contains skip directive" into nougat-mr1-cts-dev