[automerger skipped] Merge "testEncryption for device without secure lock screen" into nougat-cts-dev am: a138b9c582 -s ours am: 0edae38fec am: 91df24375d
am: 6d8138c132

Change-Id: I8d3b8b3ee2757afc3839ad0ac8a1d8c98e308a6b