[automerger skipped] Merge "testEncryption for device without secure lock screen" into nougat-cts-dev am: a138b9c582 -s ours am: 0edae38fec
am: 91df24375d

Change-Id: Ic4da78a577bb2cc2c07fdc57b60c9b0130f41616