[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

Change-Id: Ied8fffcc727c09496b4eefdb1f6c5bf8c71d6193