Making DeviceAdminUninstallTest work on watches
am: e99ad100aa

Change-Id: I44a4c0255e7f9721d12ad09e77f41180e01d0f51