Merge "Revert "Added Tapjacking test for Device admin"" into oc-dev am: e2a1a9e5d9
am: a7084f1415

Change-Id: I68afb3ccf61fbcd4530439bc2a1bd2c683618625