[automerger skipped] Merge "Merge "Revert "testEncryption for device without secure lock screen"" into nougat-cts-dev am: 6c01bccdc8" into nougat-mr1-cts-dev am: 28dbbd531d -s ours am skip reason: SHA1 28dbbd531d skipped by user paulcrowley skipped: d4eb1 skipped: d008092c24

Change-Id: I7d27b48e17dcc7278d57611008594d5932ab4748