Merge "Added Tapjacking test for Device admin" into nyc-mr1-dev am: eb25f3e9c2
am: 937cea7570

Change-Id: I1da56a7f07a4ffc1d9f763f2e85fd6149bca38c2