Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev