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