[automerger skipped] Merge "RESTRICT AUTOMERGE: testEncryption for device without secure lock screen" into nougat-mr1-cts-dev
am: d606a8121b -s ours
am skip reason: subject contains skip directive

Change-Id: I8c412f373420eaf8554019ca082e2efe962858b8