Merge "Fix documentation of EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME"