[automerger skipped] Merge "DO NOT MERGE: KeyChainTest for device that don't have Secure Lock Screen" into nougat-cts-dev am: 453f138f -s ours am skip reason: subject contains skip directive skipped: f163e35d Change-Id: Ifa80d565d39809e9f4ca27dc913fb1c57accab40