Merge "Add @RequireFeature(FEATURE_DEVICE_ADMIN) to test failing on tv." into tm-dev