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