[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 skipped: bf98f797 skipped: 5610658a Change-Id: I3e1ae7afa5ed63bd7adf175052d61cd90fa4743c
