[automerger skipped] Merge "Merge "testEncryption for device without secure lock screen" into nougat-cts-dev am: a138b9c582" into nougat-mr1-cts-dev am: bec9ad25c4 -s ours am skip reason: SHA1 bec9ad25c4 skipped by user paulcrowley skipped: 7df0289d61

Change-Id: I91cb2646d927300409dcdb7c3da5c9b5ac8450b5