Merge "Added Tapjacking test for Device admin" into nyc-mr1-dev