Merge "Verifier: remove firstApiLevel check in encryption test" into nougat-mr1-cts-dev am: 29d6907f61 am: 68eaf7c483 am: d4871562cd
am: 7ed982eddf

Change-Id: I333e10df4a6767db8764631aa49374a1053b60de