Merge "Add device admin to wearables for API8 Compat" into klp-modular-dev