[automerger skipped] Merge "testEncryption for device without secure lock screen" into nougat-cts-dev am: a138b9c582 -s ours am skip reason: SHA1 a138b9c582 skipped by user paulcrowley skipped: 645f1d9adc skipped: 88d0006554 skipped: 7e899dc939 skipped: 7 skipped: 4985b73631

Change-Id: I0f835860aafd998d8f5ea1e1656325fcb73fa19a