Merge "Deactivate device admin when the ScreenLockTest is over." am: 07794a3ead am: fa785ec1fa am: 33d851325b

Original change: https://android-review.googlesource.com/c/platform/cts/+/1473658

Change-Id: I1da87bf51a42c3ff264b93e086d52640599f7b08