[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 skipped: 11afe20461

Change-Id: I4d967dbf26e54a62079cea2c9e4e70fd7f6434e0